Fixing Bad Carpentry